Merge version 1:7.0.1-9+rpi1 and 1:7.0.1-10 to produce 1:7.0.1-10+rpi1

diff --cc debian/changelog
index 3894faa6ac8769d5a3e12e1f3eeb74ae09641b8e,7f9fb49b50c6deb881a9dd36ff1040b3db2a82bb..5bca537faef6d3ff891e4ee6cc316161bf5e725b
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,45 -1,13 +1,56 @@@
- llvm-toolchain-7 (1:7.0.1-9+rpi1) bullseye-staging; urgency=medium
++llvm-toolchain-7 (1:7.0.1-10+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from llvm-toolchain-3.8 1:3.8-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 14 May 2016 21:43:35 +0000]
 +  * Cleanup .pyc files in clean target.
 +  * Add a hack to the cmake based build to force armv6 (unfortunately the cmake
 +    based build relies on config.guess which assumes you want to build for the
 +    hardware you are running on).
 +  * Add -DCOMPILER_RT_BUILD_BUILTINS=OFF to disable parts of compiler-rt that
 +    are broken on lower arm architectures.
 +
 +  [changes introduced in llvm-toolchain-3.9 1:3.9.1-1 by Peter Michael Green]
 +  * disable testsuite (using a method that is hopefully less likely to cause diff conflicts than previously).
 +  * Remove -march=armv7-a in compiler-rt/cmake/config-ix-base.cmake
 +  * Clean up debian/usr in clean target.
 +  * Clean up clang/tools/*-3.9 in clean target.
 +  * Clean up stray *3.9.vim files
 +  * Clean up clang/tools/scan-build/man/scan-build-3.9.1 and utils/vim/llvm-3.9-vimrc
 +  * Clean up debian/*.install
 +
 +  [changes introduced in llvm-toolchain-6.0 1:6.0-1+rpi1 by Peter michael green]
 +  * create build-llvm/docs/ocamldoc/html/ so the install target doesn't complain
 +    about it not existing.
 +  * clean up more crap left behind by build process.
 +
 +  [changes introduced in llvm-toolchain-6.0 1:6.0-3+rpi1 by Peter Michael Green]
 +  * Remove debian/man in clean target.
 +
 +  [changes introduced in llvm-toolchain-7 1:7-6+rpi1 by Peter Michael Green]
 +  * Use libatomic on armhf
 +  * Set cmake/config.guess.hack back to mode 644 in clean target to keep
 +    git/dgit happy.
 +  * Yet more clean target fixes.
 +
 +  [changes introduced in llvm-toolchain-7 1:7.0.1-1+rpi2 by Peter Michael Green]
 +  * Change triplet in debian/rules to use armv6k rather than armv7l
 +
 +  [changes brought forward from 1:7.0.1-8+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Tue, 09 Jul 2019 19:04:39 +0000]
 +  * Make armv6k builds use vfpv2.
 +  * Add build-conflicts on libllvm-8-ocaml-dev
 +  * Further fixes to clean target.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sun, 18 Aug 2019 19:55:23 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 01 Feb 2020 01:10:41 +0000
++
+ llvm-toolchain-7 (1:7.0.1-10) unstable; urgency=medium
+ 
+   * Cherry-pick Ubuntu fixes from Matthias Klose:
+   * (Build-)depend on python2 instead of python.
+   * Fix the build to use python2 instead of python.
+   * Call dh_python2 to rewrite shebangs.
+ 
+  -- Matthias Klose <doko@ubuntu.com>  Thu, 09 Jan 2020 18:08:37 +0100
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Sat, 11 Jan 2020 11:14:46 +0100
  
  llvm-toolchain-7 (1:7.0.1-9) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/rules
Simple merge